Some vendor C compilers choke on C++ comments

Patch from Gary V. Vaughan

svn path=/trunk/; revision=398

diff --git a/ChangeLog b/ChangeLog
index 06e28f8e2cbab56cac62d33136ed49c31e792a6a..d144a39bab1431a8167f9f0f9673b33f8342e914 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-25  Martin Nordholts  <martinn@svn.gnome.org>
+
+       Patch from Gary V. Vaughan. Some vendor C compilers choke on C++
+       comments.
+
+       * babl/babl-fish-path.c
+       * babl/babl-fish-stats.c
+       * babl/base/model-rgb.c
+       * babl/base/rgb-constants.h
+       * tests/babl_fish_path_fitness.c
+
 2009-03-25  Martin Nordholts  <martinn@svn.gnome.org>
 
        * babl/babl-cpuaccel.h: Patch from Gary V. Vaughan. enum values

diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index b6a6582b91a0baf111627cfdce2943b3a44650c5..b69cf63553634d45a351e4973ec37ac052a39a05 100644 (file)
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -373,7 +373,7 @@ test_create (void)
   return test;
 }
 
-// FishPath instrumentation
+/* FishPath instrumentation */
 
 static Babl   *fmt_rgba_double = NULL;
 static double *test = NULL;

diff --git a/babl/babl-fish-stats.c b/babl/babl-fish-stats.c
index a6c6980bd3bcd83167de33123a15bc6700233bab..ec19f5fcaaf5f7edb90faee267931359cb92ddba 100644 (file)
--- a/babl/babl-fish-stats.c
+++ b/babl/babl-fish-stats.c
@@ -23,9 +23,11 @@ static FILE *output_file = NULL;
 static int   qux         = 0;
 
 static char *utf8_bar[] = { " ", "·", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
-//static char *utf8_bar[]=  {"!","▁","▃","▅","▇","█","!","!","!"};
-//static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", };
-//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+/*
+static char *utf8_bar[]=  {"!","▁","▃","▅","▇","█","!","!","!"};
+static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", };
+static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+*/
 
 static int
 table_destination_each (Babl *babl,

diff --git a/babl/base/model-rgb.c b/babl/base/model-rgb.c
index 46e443b704a875581b55af1b8b9fd0674885cde1..8de970e752491870b32c18599041e85bda01afbd 100644 (file)
--- a/babl/base/model-rgb.c
+++ b/babl/base/model-rgb.c
@@ -478,7 +478,7 @@ static void
 formats (void)
 {
   babl_format_new (
-    //"name", "srgb",
+    /*"name", "srgb",*/
     "id", BABL_SRGB,
     babl_model_from_id (BABL_RGB_GAMMA_2_2),
     babl_type_from_id (BABL_U8),

diff --git a/babl/base/rgb-constants.h b/babl/base/rgb-constants.h
index d8a428c1c639fb103721f4db94f47bbd15e4da7d..8f8b41006f83185f8d0b9fd6a33824eb940ca9ce 100644 (file)
--- a/babl/base/rgb-constants.h
+++ b/babl/base/rgb-constants.h
@@ -16,7 +16,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-//#define CONTEMPORARY_MONITOR
+#if 0
+#define CONTEMPORARY_MONITOR
+#endif
 
 #ifdef CONTEMPORARY_MONITOR
   /* source: http://www.poynton.com/ColorFAQ.html */

diff --git a/tests/babl_fish_path_fitness.c b/tests/babl_fish_path_fitness.c
index 7090b4b10e7844f075e0966b13cbb907a571d559..d5f5c4d78845076760d52b36b417de61de198bc9 100644 (file)
--- a/tests/babl_fish_path_fitness.c
+++ b/tests/babl_fish_path_fitness.c
@@ -26,9 +26,11 @@ test_init (void)
 static int   qux = 0;
 
 static char *utf8_bar[] = { " ", "·", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
-//static char *utf8_bar[]=  {"!","▁","▃","▅","▇","█","!","!","!"};
-//static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", };
-//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+/*
+static char *utf8_bar[]=  {"!","▁","▃","▅","▇","█","!","!","!"};
+static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", };
+static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+*/
 
 static int destination_each (Babl *babl,
                              void *userdata)